Subscribe on create
Merge pull request #16030 from cachedout/event_subscribe_on_create

Subscribe on create