[158998] Performance improvements
3 files changed