CONN-947A
Merge pull request #723 from SrinivasaMurthy/CONN-947A

CONN-947A