Merge branch 'fix/edma' into fixes