CONN-1384:Addressing pr comment