Merge fix for #20960