Merge branch 'Mac'

 Cherry pick the number display change