CXX-308 Backport 2.7.5