hotfix
Merge branch 'hotfix/nested_attr'