merge NoTippingMultiThread.java from jlee