Improved behavior for override_list_settings (rebase before merge)