fix for 35523 Scalability of refactoring
4 files changed