Merge remote branch 'pu/new-style_attributes' into wip