OOIION-1787: Support performance enhancements