Finished merge changes.
Merge remote-tracking branch 'github/gui'