Merge "bpfmt all the .bp files to silence ayeaye." into main