PIM-3250 : re-work join and condition utils