And also provide the same behaviour for DoctrineBundle