[PDI-12161] - Fixes for performance regression