Avoid double done
call in join
and add tests
#9179
Merged
done
call in join
and add tests
#9179