Merge in metadata support into master