fix #22471
fix #23496
fix #19332
fix #26551