[Upg] L4.1 support
[Fix] error in permission unit test
Merge branch '1.1' into 1.2