stash bootloader changes for merge