Merge "Remove hidden __reboot from header"