Merge "Automation adds so-adapters-so-oof-adapter.yaml"