potential fix for closed Connection
Merge branch 'master' into stable