sustain associated objects when assigning attributes
Merge branch 'develop'