Merge "Xml Support for Image Test scripts"