Merge branch 'hotfix-2.2.30'
Fix to an incorrect check for privileges in the event deletion
Merge branch 'hotfix-2.2.31' into develop