fix #26586
partial fix for #18510
fix #26811