Merge pull request #1318 from annatonger/develop

[FIX] Text Fix RT-1959 #deliver