Fix gui on autoreconnecting
Merge remote-tracking branch 'upstream/master' into lock
wip