Branch 'VADER' - spacewalk/setup