The map key should be the config with no prefix.
Merge topic 'INTERFACE_AUTOUIC_OPTIONS' into next

560a242 The map key should be the config with no prefix.