Fix merge from osbi