Merge branch 'release/1.2.6' into production
Merge tag 'v1.2.6'

1.2.6