Merging into #5936.