Merge "Add more methods for capture and injection" into tm-dev