This will be a very small conflict with my localization PR. Merge by just taking my changes here.