Merge branch 'jc/maint-reset-remove-unmerged-new' into maint