Merge "Support for multiple column ordering" into tizen