Remerge the proxy mock objects branch to apply changes similar to cfabc3d12abd501a928681c0817c903fcbae07cb to partial class mocks.