Merge remote-tracking branch 'origin/BUGFIX/raceConditionInAllwmake'