[FIX] Backport from #855