[Upg] merge conflict
fix markup in example
fix permission example
Merge branch '1.1' into 1.2