review-2: merged r1331 from 'delwin' branch into delwin-merge2 (tweaked CHost.cpp error message)
Authored by: mukau 2019-11-13
Parent: [r1356]
Child: [r1358]