review: merged 1224:1232 from 'delwin' branch into delwin-merge (resolved ddc_dump.cpp conflicts)
Authored by: mukau 2019-11-01
Parent: [r1297]
Child: [r1299]