Merge #19122 with config change

Merge #19122 with config change
use lowercase