merge edgabald change