Merge branches 'nikki-patch' and 'focusOnJoin' into beta