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