This patch is to be squashed with previous one when MDEV-19439 is fixed.
Causes assertion failurs currently.