Merge "Fix a regression in settings parsing"