Incorporating performance fix for PDI-12340.