fix partners
Merge branch 'develop'