MBS-6022, Add image mime-type support.
Merge branch 'mbs-6022'

* mbs-6022:
  MBS-6022, Add image mime-type support.