Merge remote-tracking branch 'origin/feature/8609_dropDiagnostics'
Merge remote-tracking branch 'origin/feature/8638_addsamplelog_starttime'
Merge remote-tracking branch 'origin/bugfix/8630_small_scd'
Merge remote-tracking branch 'origin/bugfix/8648_missingAlgoHistory'
Refs #8657 Added the QENS category
Merge branch 'feature/8657_correct_category' into develop