[TIDOC-190] PR comments