Merge branch 'fix/multithreading-disabled-freeflow' into 'master'

Merged Timo Koch requested to merge cherry-pick-1f15ec18 into releases/3.7

Merge request reports