Branch 'master-pxe-default-image' - java/code