[DF-2435] merge from DF-2435_MimeHelper_refactoring into development