Merge remote-tracking branch 'origin/update-from-template-xdev-software/java-setup-template'

Author: AB-xdev