SP-232 - Backport of PDI-8986