INT-3312: PR comments