Merge branch 'feature/gui2' into develop