Merge branch 'master' into connection-test-timeout