SP-512 - Backport of PDI-5595 to 5.0