CXX-182 first integration pass