Fixed variable not showing up.

Fixed variable not showing up.
[Fix] errors in docs
Merge branch '1.1' into 1.2
Merge branch '1.2'