review: merged r1180:1211 from 'delwin' branch into delwin-merge
Authored by: mukau 2019-10-31
Parent: [r1295]
Child: [r1297]