Merge for #26844