Updated version release
Merge branch 'release_1.2' into develop