[Upg] refactoring coding style
Merge branch '1.2'