Merge branch 'get_events_for_objects' into stable