Backport/backport 3263 to 2.x#3335

penghuo merged 1 commit intoopensearch-project:2.xopensearch-project/sql:2.xfrom

songkant-aws:backport/backport-3263-to-2.xsongkant-aws/sql:backport/backport-3263-to-2.xCopy head branch name to clipboard