[Backport 1.x] Backport #1586 to 1.3 branch

[opensearch-trigger-bot]

Backport 0c2ba70 from #1617

[codecov-commenter]

Codecov Report

Merging #1621 (bfa4038) into 1.x (dd8deff) will decrease coverage by 3.15%.
The diff coverage is n/a.

❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more.

@@             Coverage Diff              @@
##                1.x    #1621      +/-   ##
============================================
- Coverage     98.40%   95.25%   -3.15%     
  Complexity     2746     2746              
============================================
  Files           266      276      +10     
  Lines          6758     7416     +658     
  Branches        426      546     +120     
============================================
+ Hits           6650     7064     +414     
- Misses          107      298     +191     
- Partials          1       54      +53     

Flag	Coverage Δ
query-workbench	62.91% <ø> (?)
sql-engine	98.40% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

see 10 files with indirect coverage changes