CONN-829B
Merge pull request #693 from SrinivasaMurthy/CONN-829B

CONN-829B