Merge "Fix for giant font" into 2.0_beta