Merge branch 'hotfix/1.0.4'
Fix entity subset selection
Fix deprecated clears in AAs
Merge branch 'hotfix/1.0.5' into develop