[FEATURE] Rejoins should use specific or original join options