merge from dibyendu