CONN-674: Fixed Privacy Viloation issues