Merge "Settings: No really, keep the trailing space." into lmp-dev