CONN-92 Addressing code review comment