[PATCH 0/1] Save and Reset button fix