New version
Merge branch 'release/v1.2.7.1' into develop