Merge branch 'crossAdapterJoins' into multiAssociations