Merge branch 'jc/maint-reset-unmerged-path' into maint