Switched the loaction of ORDER BY clause to the end of the SELECT statement
Merge branch '0.3'