Merge branch 'release/1.2.7' into production
Merge tag 'v1.2.7'

1.2.7