PIM-3196: fix PR comments