y2-bl change looks good. mchang - can you please write down here when you send modified grub2 to TW? as I need to wait with merging for you.