refs #7144 Some more refactoring
Merge branch 'feature/7144_new_v_conv_spectrum_axis' into develop