New C++ source code from 15.11