Post Realse 24

[roshan-sy]

Please make sure the code is following contribution guidelines in CONTRIBUTING.md

• [ ] : This PR has a corresponding issue open in the Repository.
• [ ] : Approach is signed off on the issue.