Merge "Fix Preference mis-alignment" into sc-dev