[Upg] docs
[Upg] docs
Merge branch '1.2'