Merge branch 'hotfix/1.0b4.3'
Merge branch 'develop'
Merge branch 'release/1.0b6'
fix get association