SP-326 - backport of PDI-9908

Backport of the issue 9908