[SP-397] Backport [PDI-4325]