merge latest omnirom changes