CONN-760
Merge pull request #658 from SrinivasaMurthy/CONN-760

CONN-760