Merge pull request #1341 from shackbarth/23108-join2