An update to use new entity validation api
Merge branch 'refs/heads/Hotfix/AggregateValidation' into release