Build 92.3: further performance enhancements