CXX-205 post 0.8.0