[SP-397] for [PDI-4325]