INT-3477: PR review