Bugfix for missing use of new entity classes.
Merge remote-tracking branch 'remotes/remote/feature/67-push-metadata' into feature/98-require-only-ePPN