fix #26106
fix #26041
fix #26096