[FIX] fix after rebase (RT-2684)