Some merges from omni