Reverting merge to Master

- revert of 9d59c7e - Mercury Save button