merge from David