Merge "Fix implict bp broken ui." into 24D1-dev