Merge "Restrict SimPreference" into main