Change: Joins now translate into left joins
Manual merge