Merge "Fix user category priority issue" into main