merged eda changes in