Refs #8496 need one more if test
Merge branch 'feature/8496_SaveHKL_noSample' into develop