for release
Merge branch 'release/v1.2_release' into develop