fix regression because of lazy proxies
fix regression because of lazy proxies
Merge branch 'hotfix' into develop