Merge pull request #12160 from aydun/core_124_event_approval_fixes