Merge branch 'release/5.22.0'