Merge branch 'release/2.5.0' into production
Merge tag 'v2.5.0'

2.5.0