Sp-1054 - Backport of PDI-11319