Omni 4.3

Omni-4.3 branch