Merge remote-tracking branch 'origin/feature/performance-optimization'