Bug Fix: Replace and Save would not actually save changes
Merge branch 'dev'