Changes to 'SPACEWALK-1.6'