Merge "db845c/rb5: Make version 4 as the default boot image header" into main