Merge "Assign default user sort type issue is fixed" into release-3.2.0