Squashed '$external/ProxyGenerator/' changes from 4f6a1f0..12076d3

12076d3 test

git-subtree-dir: $external/ProxyGenerator
git-subtree-split: 12076d3a6f4d1831f63e31ccfc2018389b7a1088
Merge commit '7db78c0f2cd2035d4fda8585a5d31bcb0c4f4d68'
+ git command