Merging windshaft into master