INT-3458: Addressing PR comments