Merge branch 'rm-follow-2699' into 'master'

Fix functor cache for release builds (follow up !2699)

See merge request !2829
2 jobs for master in 24 seconds