review-2: merged r1345:1350 from 'delwin' branch into delwin-merge2 (resolved conflict with r1335)
Authored by: mukau 2019-11-13
Parent: [r1364]
Child: [r1366]