Merge "PREUPLOAD += bpfmt" into main