SP-787 - Backport of PDI-7070