Merge pull request #3364 from mshabunin:doxygen-docs-24