Merge "Move product string definition" into tm-dev