Merge branch 'release/1.2.10' into production
Merge tag 'v1.2.10'

1.2.10