Merge pull request #12424 from alifrumin/editOwnEvents