Merge branch 'cherry-pick-bf9908a7' into '21.0'

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

See merge request !2771

Former-commit-id: 168f1c07c25f9004365602be58a95e4f31166c09