INTSAMPLES-131: PR comments