Sched and edp: Last useful edits before official version will go out