Merge "various autojoin fixes"