Re #10442 Attempting to fix cppcheck_develop errors
Merge branch 'bugfix/10442_SaveGSS_overlapping_output_numbers' into develop