Merge "Singularization of duplicated multi user strings." into tm-dev