Merge "Fix bug when upgrading CP2 to generate hash_id column."