Merge fix for #25029