Merge branch 'fix/deactivate-fcstaggered-multithreaded-assembly' into 'master'

Merged Timo Koch requested to merge cherry-pick-247c176e into releases/3.7

Merge request reports