Re #8365 Fix CPPCheck and Doxygen warnings.
Re #8365 Removed unfinished test.
Merge branch 'feature/8365_ILL_D2B' into develop