updated for release 0.125
Merge branch 'release/release_0.125' into develop