Branch 'SPACEWALK-1.3' - backend/server