Easier than expected?
Merge branch 'fix_DE8'