[FIX] RT-1959 #Delivered
Merge pull request #1320 from annatonger/fix/textfix3

[FIX] RT-1959 #Delivered
[FIX] RT-1959 #Delivered
Merge pull request #1321 from annatonger/fix/textfix3

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

[FIX] RT-1959 #Deliver
[FIX] RT-1959 #Deliver
Merge pull request #1323 from annatonger/fix/textfix6

[FIX] RT-1959 #Deliver
[FIX] RT-1959 #Finish
Merge pull request #1324 from annatonger/fix/textfix7

[FIX] RT-1959 #Finish