Merge branch 'master' into qs_no_recaptures

bench: 5138234