Fix result hasManyAndBelongsTo
Merge branch 'dev'