[dLeyna] Settings management upcoming changes