Merge "Update image versions"