Merge branch 'release/5.0.6'
Hotfix for ListenOnJoin
Merge branch 'hotfix/ListenOnJoin' into develop