bring in sync with MultiROM-yuga