Merge branch 'cherry-pick-cc459c3a' into 'cherry-pick-2893fd45'

Merge branch 'cleanup/test-ff-benchmark' into 'master'

See merge request !3306
6 jobs for !3305 with cherry-pick-2893fd45 in 52 seconds (queued for 2 seconds)
latest merge request