Merge pull request #8374 from mollux/CRM-18563_documentation