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

Cleanup/test ff benchmark

See merge request !3302

(cherry picked from commit cc459c3a)

9790c70b [test][ff] Cleanup unstructured ff benchmark test
6 jobs for !3306 with cherry-pick-cc459c3a in 8 seconds (queued for 3 seconds)
latest merge request