Fixed Colors for Bundling
Merge branch 'hotfix/3.9.4' into develop
Merge branch 'develop' into mnch