Merge pull request #5021 from BrzVlad/fix-parallel-fixes