Merge "devtools/prodimage: create"