Version 4.6 Backport Of PRs #12187 & #12192 #12446
vinuvarshith:security_packages_issue_2_backport_4.6% was force-pushed and no longer has any new commits.
Pushing new commits will allow the pull request to be re-opened.
Pushing new commits will allow the pull request to be re-opened.