Code

Merge branch 'jc/maint-reset' into maint