[DATA-2239] Fix