misc: Merge branch 'release-staging-v22-0' into stable