JCR-2210 : Apply remarks (PART 3)