Merge "Reformat BpBinder.h" into main