Merge remote-tracking branch 'origin/feature/basicGui' into develop