Merge from omni