Applied patch #6428