timeline host is not hardcoded
Merge branch 'master' into builds
7.20