JCR-2051: Remarks of Anatoliy took into account