CXX-182 first integration pass
CXX-182 first integration pass