PLA-917 performance optimizations