Trunk checkout
Patch fixes