Doctrine Common

[GH-248] Hotfix/doctrine/common#247 fixes