Merge branch 'da/pull-ff-configuration'