This is for JP
Fixing baked badge issue
Fix rebake error.