### What problem does this PR solve? #2484 ### Type of change - [x] Performance Improvement - [ ] Other (please describe):