bump version 2.2.5
Merge branch 'release/2.2.5' into develop