Merge branch 'hotfix/ListenOnJoin' into develop
Releace 5.0.7
Merge branch 'release/5.0.7'