Fixes #17277 - quote host properties
(cherry picked from commit 3ce090168d601fd0b38e896394e521eadc693a9a)
Fixes #17277 - quote host properties
(cherry picked from commit 3ce090168d601fd0b38e896394e521eadc693a9a)