JCR-2262: Apply doc remarks