Adding scripts/styles, date ranges, and i18n, and more
Completing merge