merge trunk into 36 branch