merge of doctrine master