Doctrine 2 - ORM

[GH-540] [DDC-2208] Fix DDC-2208