Handle the new config introduced in #15576
Handle the new config introduced in #15576