review-2: merged r1322:1328 from 'delwin' branch into delwin-merge2
Authored by: mukau 2019-11-13
Parent: [r1353]
Child: [r1355]