patch #6135