Merge "Review comments followup" into tm-dev