bug fix- formatting
Merge branch 'mingshu' into sprint8