Cherry pick ic commits from gp7

[zhangyue1818]

Fixes #ISSUE_Number

What does this PR do?

Type of Change

• [ ] Bug fix (non-breaking change)
• [ ] New feature (non-breaking change)
• [ ] Breaking change (fix or feature with breaking changes)
• [ ] Documentation update

Breaking Changes

Test Plan

• [ ] Unit tests added/updated
• [ ] Integration tests added/updated
• [ ] Passed make installcheck
• [ ] Passed make -C src/test installcheck-cbdb-parallel

Impact

Performance:

User-facing changes:

Dependencies:

Checklist

• [ ] Followed contribution guide
• [ ] Added/updated documentation
• [ ] Reviewed code for security implications
• [ ] Requested review from cloudberry committers

Additional Context

CI Skip Instructions

---