SP-983 Backport of PDI-11082