SP-643 - Backport of PDI-10749
Merge pull request #232 from askdzmitry/SP-643

SP-643 Backport of PDI-10749