Merge "Improvements to user settings" into lmp-dev