-Merged gui_upgrade into chrissy_branch