review: merged r1250:1256 from 'delwin' branch into delwin-merge (resolved more ddc_dump.cpp conflicts)
Authored by: mukau 2019-11-04
Parent: [r1300]
Child: [r1302]