[Upg] delete harcoded permissions
Merge branch '1.1' into permissions
Merge branch '1.1' into 1.2