CONN-1524: Addressed the review comments