Doctrine 2 - ORM

[GH-517] Fix for DDC-1765