CONN-674: Fixed Privacy Viloation issues
Merge pull request #613 from nareshcgi/CONN-674A

CONN-674: Fixed Privacy Viloation issues