Adding automatic tertiary table-joining to N-to-N joins

When an N-to-N table join includes a reference to a tertiary table with a foreign key in any
of the N-to-N tables it is automatically joined to
Merge remote branch 'origin/qa' into develop