Merged selfcontained back to trunk