Merge branch 'mm/merge-rename-delete-message'