merge trunk code