/gui updated
Merge branch 'hotfixes' into develop