Merge branch 'jc/maint-reset'