Rebased version of JoinNode PR repaces #643