JCR-2211 : Apply given remarks