SP-977 - Backport of PDI-9197