Merge "Fix SettingsIncidentTest#testBasicStructure"