Additional work for CPPXT-40.