Merge "[Suggestion] Keeping user settings for suggestion" into sc-dev