Merge "Fix implict bp broken ui." into main