Merge remote-tracking branch 'tawfekov/master' into feature/i18n