INT-3070: PR comments