Re #9933. Missed one.
Merge branch 'feature/9933_savegss_improve' into develop