Merge "Fix the getUserBadge test failure" into main