Merge branch 'hotfix/1.21.1'
use new tests, update #1976
add fuzzy matching for head rubies, fix #1979
1.21.2
Merge branch 'master' into hotfix/1.21.2
Merge branch 'hotfix/1.21.2' into stable