Support to configure and build multiple custom images.
automerge: ae61f50

* commit 'ae61f50a680d4a8e91274b35305dc2e24959abbe':
  Support to configure and build multiple custom images.