Check for joins.
Merge branch '4.2'