Merge DMAPI fixes from Tridge