BACKLOG-926 Since there seem to be several points where the current entity is still expected to be in remote entities replaced merge current en remote entities solution by a proxy solutuin