Merge "TIAF API review: multiple components" into tm-dev