Merge branch 'cleanup/resolve-deprecations-ff' into 'master'

[coupling-ff-pm] resolve deprecation of ff problems

See merge request !128

(cherry picked from commit dd11d555)

1f919e91 [coupling-ff-pm] resolve deprecation of ff problems
1 job for !129 with cherry-pick-dd11d555
latest merge request