Merge branch 'hotfix-2.3.35' into develop
Merge branch 'hotfix-2.3.35' into develop
Fix to some event altering actions not updating the timestamp
Merge branch 'hotfix-2.3.36'