SP-1323 - Backport of PDI-12215