SP-643 Backport of PDI-10749