SP-204 - Backport of PDI-9844