released version 2.5.0
Merge branch 'release/2.5' into develop