bug fix- formatting
Merge branch 'mingshu' into sprint8
Merge branch 'jon' into sprint8