Merge remote branch 'origin/feature/6845_export_log'
Merge remote branch 'origin/feature/6815_selective_peaks'
Deprecated LoadDAE. Re #6854.
Merge branch 'feature/6854_deprecate_loadDAE' into develop