Merge OpenSearch-related changes.
4 files changed