Swapped places indexBy and condition in accordance with EBNF
Added test complex inner join with indexBy
Merge branch 'DDC-2437' into 2.3