[3.9] Update entity proxies