improve association attributes assignments
Merge branch 'develop'