Merge "Do not append additional delimiters" into tm-dev