FORGE-1570: Introduced UICommandEnricher