Branch 22.08 merge 22.06 (#2359)

Resolves merge conflict in `CHANGELOG.md` from `branch-22.06` to `branch-22.08`

Authors:
  - Rick Ratzel (https://github.com/rlratzel)
  - Ray Douglass (https://github.com/raydouglass)

Approvers:
  - Joseph Nke (https://github.com/jnke2016)
  - Brad Rees (https://github.com/BradReesWork)

URL: #2359

Author: rlratzel