Tables in SELECT...FROM clause are sorted alphabetically
Merge branch '2.1'