merge yugene changes