initial import
Integrate existing patches.