Merge "Improve metadata support"