SP-818 Backport of PDI-10936