reapply and some new changes

see: https://l10n.mozilla.org/dashboard/compare?run=365363