fix rights
fix build
Merge branch 'develop'