Merge branch 'bug/edit-other-users-talks'