Bump version, and draft a fix for CPPXT-40