changes and merge yugene changes