Merge "Addressing CL feedback." into tm-dev