port changes for e-d-s and evolution from the gnome overlay