Merge branch 'bg/merge-ff-only'