Merge branch 'mg/replace-resolve-delete' into next