Merge branch '351_cxx' into rolk