Cherry-pick of f37f6ef26a190bf645f82e10b60e1580f1e5ac55

[reshke]

cherry-picking gp7 commit https://github.com/greenplum-db/gpdb-archive/commit/f37f6ef26a190bf645f82e10b60e1580f1e5ac55

p.s. I still fighting tests failures in my other cherry-pick PR, I did not stale them

fix #ISSUE_Number

---

Change logs

Describe your change clearly, including what problem is being solved or what feature is being added.

If it has some breaking backward or forward compatibility, please clary.

Why are the changes needed?

Describe why the changes are necessary.

Does this PR introduce any user-facing change?

If yes, please clarify the previous behavior and the change this PR proposes.

How was this patch tested?

Please detail how the changes were tested, including manual tests and any relevant unit or integration tests.

Contributor's Checklist

Here are some reminders and checklists before/when submitting your pull request, please check them:

• [x] Make sure your Pull Request has a clear title and commit message. You can take git-commit template as a reference.
• [x] Sign the Contributor License Agreement as prompted for your first-time contribution(One-time setup).
• [x] Learn the coding contribution guide, including our code conventions, workflow and more.
• [x] List your communication in the GitHub Issues or Discussions (if has or needed).
• [x] Document changes.
• [x] Add tests for the change
• [x] Pass make installcheck
• [x] Pass make -C src/test installcheck-cbdb-parallel
• [x] Feel free to request cloudberrydb/dev team for review and approval when your PR is ready🥳

[CLAassistant]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 2 committers have signed the CLA.

:white_check_mark: reshke
:x: SmartKeyerror
_{You have signed the CLA already but the status is still pending? Let us recheck it.}