Merge "Require bootloader 1022"