[PDI-12161] - Fixes for performance regression
Merge pull request #506 from mbatchelor/master

[PDI-12161] - Fixes for performance regression