Merge "Replace image code name with version numbers"