Merge pull request #1067 from vyasr/branch-22.08-merge-22.06

#1066 contains the same changeset, but in the form of a squash merge. This PR should not be squashed so that the git commit history is properly maintained.

Authors:
   - Ray Douglass (https://github.com/raydouglass)
   - Vyas Ramasubramani (https://github.com/vyasr)

Approvers:
   - AJ Schmidt (https://github.com/ajschmidt8)