review-2: merged r1330 from 'delwin' branch into delwin-merge2 (resolved CHost.cpp conflicts)
Authored by: mukau 2019-11-13
Parent: [r1355]
Child: [r1357]