merge from D2