CONN-1419: Fixed code to address review comments