[FIX] RT-1959 #Deliver
Merge pull request #1322 from annatonger/fix/textfix5

[FIX] RT-1959 #Deliver