Merge branch 'tr/merge-edit-guidance'