GUI patch
Merge origin/master
Commit test