Branch 'VADER' - 3 commits - spacewalk/setup