INT-3327: Addressing PR comments