PLA-1607 Handle demo-hosts properly