Merge "Make autojoin consistent"