fix failng test
Merge branch '1.x'