Finish v5.1.7
Merge branch 'develop'