+ change made.
+ some changes.
Merge branch 'release/1.2' into develop