Non-conflicting OSX/Linux environment for 6.0.4

Merge request reports

Loading