Attribute.plugin.retrieve should return everything not just current.
Merge branch 'develop' into release/4.6
Merge branch 'release/4.6'