Update entity proxies
Merge pull request #589 from nlegoff/proxies

[3.9] Update entity proxies