CLC-2617 Fix connection-clearing logic
Merge pull request #1652 from ctweney/clc-2617

CLC-2617 Fix connection-clearing logic