Upstream PR: 1. https://github.com/opensearch-project/OpenSearch/pull/6009 2. https://github.com/opensearch-project/OpenSearch/pull/5589