manual merge from freed