Added merge from DOR