SP-642 Backport of PDI-10748