SP-456 - Backporting PDI-10582