Merge "Remove concept of nits from the client target properties" into tm-dev