Merge "Fix failed enterprise unit tests in CP2" into nyc-dev