Enricher

INT-3465:Content Enricher Improvements
Bad merge with previous version.
Your branch isn't buildable.