HOTFIX DDBNNEXT-967 due to GIT merge problems