Hass AbouZeid authored Jun 20, 2017 and Atlas Nightlybuild committed Jun 21, 2017

Merge branch 'msgdowngrade-muoncreatortool' into '21.1' -- cherry-pick from 21.1 to 21.0

See merge request !2771

Former-commit-id: b6ddf61e