Updating version
Merge branch 'release/v1.2.5' into develop