Merge "Modify METADATA file after upgrade" into main