Merge branch 'release/1.2.5' into production
Merge tag 'v1.2.5'

1.2.5