Merge branch 'Performance-optimization'