Fix Issue 11696 - incorrect static C++ member mangling