SP-642 Backport of PDI-10748
Merge pull request #222 from askdzmitry/SP-642

SP-642 Backport of PDI-10748