[VKC-148] common core sync from cpi main commit e68e5d199d99

[sakthisunda]

Description

Please provide a brief description of the changes proposed in this Pull Request

Checklist

• [ ] tested locally
• [ ] updated any relevant dependencies
• [ ] updated any relevant documentation or examples

Testing Done

Please provide a screenshot of the testing results for the code change in this Pull Request. Verify that this pull request's code change will not affect CSI's normal operation

Issue

If applicable, please reference the relevant issue

Fixes #

---

This change is