EDL-595-805 and EDL-695-805 merged (Summer 2020)