Initial bringing up to Omni-4.4