SP-977 - Backport of PDI-9197
Merge pull request #250 from askdzmitry/SP-977

SP-977 - Backport of PDI-9197