Fix permit issue
Merge branch 'develop'