Revert "Revert "Save update and config fix""

This reverts commit 3507ad4022eba3ab4a249fca5517f90e7129b5f4.