SP-1019 - Backport of PDI-4910