Merge branch 'en/merge-options-ff-and-friends'