Fix test.
Merge branch '4.2'