proxies to support deep proxying, fix ShardTracking creating the deep proxying
Merge branch 'basic_object_proxy'