Merge "add image smoke tags"