Merge branch 'pt/pull-ff-vs-merge-ff' into maint