Merge "correct the comments information for settings"