v1.3.8 performance enhancements