Merge "Revert "Fix the badge in badge (triple badging), by simply remov..."" into main