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