Merge "Quick fix for performance degradation bug"