Re #1300: Collected EDM Schema changes