Fixed realtime index query serving failure due to incorrect treatment of DataSource
Merge branch 'subquery' into 0.6.57-n3twork