Merge branch 'hotfix/cs-overzealousness'

Fixes #6520
fixed conflicted phpdoc return values (see #6511
Merge branch 'hotfix/#6512-fix-#6511-sharedeventmanager-return-values-phpdoc' into develop

Forward port #6512
Forward port #6511