[34] Optimizations and Doc updates