no longer disconnecting to reauthenticate
Merge branch 'develop' into release