Merge "Refactoring in Settings/Applications"