Merge branch 'refs/heads/master' into release
Do not use entity validator as they are now deprecated in favor of linked entity and linked collection validators.
Refactored to use new aggregate validation api
Merge branch 'refs/heads/release'