Disabled reconnection
Merge branch 'master' into secured