Merge branch 'bugfix/8343_c2e_diag_tab_spectrum_error' into develop