Applied patch #5611