Merge remote-tracking branch 'origin/gui-sprint3'
Merge remote-tracking branch 'origin/master' into gui-sprint3