WIP: Merge DragonFly bits from 2.3 -- untested