SP-392 backport of PDI-10242

What was done
1) backport of fix from master branch