INT-3448: Addressing PR comments