#4007: Updated Doxygen
Merge branch '4007-update-for-doxygen'

* 4007-update-for-doxygen:
  #4007: Updated Doxygen