PDI-10796 - Fix perf issue and unit test
Merge pull request #255 from askdzmitry/PDI-10796-2

PDI-10796 - Fix perf issue and integration test