Merge the fix for #24267