Merge "Fix proto invalid write type" into tm-dev