Merge "Debug settings changes"