fix indemma association deserialization
Merge branch 'develop'