Merge "Fix Bp small to large transition" into main