Merge "TIAF API review: add JavaDoc" into tm-dev