Merge branch 'tb/test-t9020-no-which' into maint