Merge "Add OSA adapter for XCI"