Fixed doxygen warnings. Re #6137.
Merge branch 'feature/6137_instrument_view' into develop