[NO_MERGE] Doctrine master

:construction: