update for nexus oss merge