Merge "Fixed a bug where the font sizes where not enforced correctly" into nyc-dev