fix inconsistent format
Merge branch 'fix-format-inconsistency' into build-27