Merge "bug fix - font size" into 2.0_beta