SP-818 Backport of PDI-10936
Merge pull request #309 from askdzmitry/SP-818

SP-818 Backport of PDI-10936