Merge "Test for bootloader state"