Feature/jorgen.lind/java updates

Merged Jørgen Lind requested to merge feature/jorgen.lind/java_updates into master

Merge request reports