Remote helpers
Send error helper
Fix i18n naming and initialization
Merge remote-tracking branch 'upstream/master'