Merge branch 'master' into auto-reconn

auto-reconn ends