review-2: merged r1339:1343 from 'delwin' branch into delwin-merge2 (minor edits)
Authored by: mukau 2019-11-13
Parent: [r1361]
Child: [r1363]