INT-3532: Addressing PR comments