Fix matching base MD_Metadata
Merge branch 'metadata_template_enhancement_code' into metadata_template_enhancement