Reinstate DAE schema

Merged Johan Richer requested to merge johan-master-patch-56789 into master

Merge request reports