Merge branch 'dev' into contao3
Changed the queries to use a subselect as otherwise the language order is unpredictable.
Merge branch 'dev' into contao3
Merge branch 'contao3' into tng