introduced flag to not load locale during initialization in I18n
Merge remote-tracking branch 'origin/dev' into dev