Merge "Enforce consistent formatting of .bp files"