TTT Service ready-ish
Merge commit 'a41c5257b7570363f5c699257295e09f644de589'