Update v243285


  1. Misc performance improvements.