Merge branch 'entity-proxy-fields'