Merge remote branch 'origin/feature/6731_fix_doxygen_error'
Fixed compiler warning. Re #6609.
Merge branch 'feature/6609_d-spacing_change' into develop