Merge changes from Omni.