Applied patch #6420