Merge "Move service initialization" into tm-dev