Merge branch 'hotfix-2.1.7'
Fix to not being able to accept shadowAttributes

- recursive -1 used for loading attribute, then referencing the event
Merge branch 'hotfix-2.1.9' into develop