Merge branch 'nikki-patch' into beta
Merge branch 'focusOnJoin' into beta