Branch 'fve' - java/code