Merge pull request #16148 from alalek:doxygen_update_config