finch chat join fixed #5288036530886
Merge branch 'CL-5288036530886'