Merge branch 'attribute_access' into release