Merge branch 'hotfix/v1.22.1'
fix test broken by previous hotfix
Merge branch 'hotfix/v1.22.2' into develop