INT-3442: Addressing PR comments