fix #25594
fix #25551
fix mtest