Migrate Join logic away from traits #668
+195
−342
Merged
Loading