EN #4304 improvements and cleanup#64

eneumann merged 5 commits intodeveloppolyapi/polyapi-java:developfrom

EN_#4304_improvements-and-cleanuppolyapi/polyapi-java:EN_#4304_improvements-and-cleanupCopy head branch name to clipboard