Merge branch 'jc/maint-branch-mergeoptions' into maint