Pdi 11848 5.1 backport