Merge "Bug 5031179 possible fix for assert in join"