Merge branch 'hotfix-2.3.12'
Merge branch 'hotfix-2.3.13'
Merge branch 'hotfix-2.3.14'
Event attribute pagination is persistent through edits / deletes
Merge branch 'hotfix-2.3.15'
Made the version check exclusive to the diagnostics tab
Merge branch 'hotfix-2.3.16' into develop