fix #25945
fix mtest