fix test with invalid null value
Merge branch '1.12'