Change entities
Merge branch 'java-version-fix' into develop