Merge "Image version updates for test"