Fixed #23384 -- Allowed overriding part of a dictionary-type setting

This change is needed for upcoming changes where settings might be
grouped in a parent dictionary.
@ross, hope you receive this one. Are you OK with this borrowal and attribution?