Merge trunk for LP