Continue with porting to 4.0.x. PackageSetup file migrated to OM.