Merge build with LP trunk