Merge "Fix can't start injected item problem" into tm-dev