Merge "Use different varname for upgraded hash from original hash"