Merge "Fix empty resource showing "Und"" into tm-dev