Merge "Update TARE UI." into tm-dev