Combined implementation of https://jira.surfconext.nl/jira/browse/CDK-98 and https://jira.surfconext.nl/jira/browse/CDK-89