Branch 'VADER' - 2 commits - java/buildconf java/code