YH-164: Secondary hostname
Merge branch 'master' into ci-testing
YH-164: Multiple sites