Merge "Merge "Correct the METADATA information." am: a00b917149" into main-16k