Merge "Fix the category preference aligement problem" into sc-dev