fix task models
Merge branch 'develop'