Fixing/breaking attributeContext
attributeContext issue, parameters wrapped in ParentWrapper
Merge branch 'attributes2'