Cherry picking missing changes from 7.11 release to main#3525

nunnikri merged 2 commits into

mainROCm/TheRock:mainfrom

users/nunnikri/release-main-syncROCm/TheRock:users/nunnikri/release-main-syncCopy head branch name to clipboard