Update oa_core
Update oa_events
Merge branch 'updates-7.x-2.x' into ks-dev-7.x-2.x