Merge "Adapt to O-RU use case spec"