fix code style
Merge branch '11-27-3'