Branch 'fve' - 2 commits - java/code