Merge "Modify the path message to correct path." into tm-dev