SP-512 backport of PDI-8195 to 5.0