Merge tag 'v2.5.0'

2.5.0
Update deps
Merge branch 'release/2.5.1' into production