Event attribute pagination is persistent through edits / deletes
Merge branch 'hotfix-2.3.15'