Refs #2135 i18n + improvements (custom loading message when segment applied)
Merge remote-tracking branch 'origin/master'