Cam 1654

see https://app.camunda.com/jira/browse/CAM-1654?focusedCommentId=33073#comment-33073 - only one commit of this pull request is actually the issue