merge from Deepali