Branch 'VADER' - 3 commits - java/code