Merge "Support image classes filtering in image writer"
am: ea6e755688

* commit 'ea6e7556887716b806f377c018fb6514bdae5bca':
  Support image classes filtering in image writer