Merge Release1.2 into Master