Add getEntity to persistence service
Merge branch 'develop-persistence-services' into develop