Release 2.5.0
Merge branch 'release/v2_5_0' into dev