Merge "Enable boot_option to be specified"