Update ClientSettings & MasterSettings
Update MasterSettings by reorganizing imports.