Changes to 'SPACEWALK-1.8'