Merge pull request #5266 from vancem/EventSoruceComplexTypeFix