review: merged r1211:1224 from 'delwin' branch into delwin-merge
Authored by: mukau 2019-10-31
Parent: [r1296]
Child: [r1298]