bug fix
has_many issues
Merge branch 'feature/t580' into develop