Changes to 'SPACEWALK-0.7'