Sync with main: resolve merge conflict (#452)

Co-authored-by: Muhammad Awad <112003944+mawad-amd@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>
Co-authored-by: Ryan Swann <109695074+ryanswann-amd@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Muhammad Osama <osama94@gmail.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: JoseSantosAMD <87447437+JoseSantosAMD@users.noreply.github.com>

Author: 8 people