fix #37456
fix #22904