Merge branch 'jk/replace-edit-raw'