Merge branch 'focusOnJoin' into beta