version to 1.2
Merge release-1.2 to develop