SP-1025 - Backport of PDI-8986