Doctrine 1

Invalid fix [6568] for DC-132