Further corner case fixed (shadow attribute to attribute, not event)
Merge branch 'hotfix-2.3.25'