manual cherry pick: (partial) bugfix for save tool