SP-517 - Backport of PDI-10503