[FIX] RT-1960 #Deliver