Chat bug fix
Merged develop into local