CONN-1416:Addressing pr comment