Squash merge branch 'storage_event_speed' into 'master'
feat: events query speed optimization