https://jira.surfconext.nl/jira/browse/CDK-124
Merge branch 'master' into CDK-108
Merge branch 'CDK-108'