Merge branch 'cleanup-c++-code'