Merge branch 'spear/dwdma' into late/cleanup