Merge pull request #17861 from totten/master-dao-event