SP-1054 - fix - backport of PDI-11319
Merge pull request #395 from dbahdano/SP-1054

Sp-1054 - Backport of PDI-11319