fix #39006
fix #38856