Add flatten property for image spec
Merge branch 'image-spec'