Both the Role and Context Accessor are added to data objects by the context
Merge branch 'accessor'