[Upg] validator rules in config
[Fix] coding style
Merge branch '1.1' into 1.2