2 Commits (fe/perf)