Merge branch 'startup-gui-option' into merged