Backport to Tarantool 1.5.x