Code

Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config