[Upg] self ban restricted
Merge branch '1.1' into 1.2