Merge branch 'master' into next

Merge in v2022.07-rc5.