Initial merge from local work