Merge branch 'release/v1.2.7' into develop
Fix damn error
Merge branch 'refs/heads/develop'