Merge "Align with metadata API changes"