convert to junit4
Merge branch '1.12'