CXX-321 changes from CR