Upgrade to Omnibus 4.0