Re #10442 SaveGSS overlapping output numbers
Merge branch 'bugfix/10442_SaveGSS_overlapping_output_numbers' into develop