Branch 'SPACEWALK-1.0' - java/code