Merge branch 'cc/replace-edit'