r9357: initial update-object-joins