CONN-833
Merge pull request #688 from SrinivasaMurthy/CONN-833

CONN-833