+ review branch for merging 'delwin' into trunk
Authored by: mukau 2019-10-31
Parent: [r1294]
Child: [r1296]