use auto-reconnect
Merge branch 'master' into portable