Merge branch 'c++-enhance-proxies'