Merge "TIAF API review: xml attributes and package handling" into tm-dev