Merge branch 'mg/merge-ff-config'