Merge fixes early for next maint series.