Merge "Add output enrichment validation"