[FIX] RT-1960 #Deliver
Merge pull request #1326 from annatonger/fix/test

[FIX] RT-1960 #Deliver