backport PDI-11389