Improve badges mixinability
Merge pull request #12969 from ZDroid/badge-mixin

Improve badges mixinability