SP-282 Backport for PDI-10113
Merge pull request #2 from askdzmitry/SP-282

SP-282 Backport for PDI-10113 for 4.8