CONN-668:Addressing PR comments