JCR-2175: The doc
Merge branch 'feature/JCR-2175'