Hotfix/DDC-2306

See [DDC-2306](http://www.doctrine-project.org/jira/browse/DDC-2306) and commit messages