Merge todos

This fixes the outstanding TODOs for 1.11 merge.
The class AutomaticDmsExport is obsolete and was deleted.