CXX-182 third review updates