Merge "Fix performance degradation bug"