Branch 'VADER' - 4 commits - java/code schema/spacewalk