Merge "Address API review feedback" into tm-dev