[PATCH 00/11][image_factory] Miscellanous patches