fix #33381
fix #33011
fix #35496