Upstream merge
Remove 'Normalize spaces on when reading a chat packet' as it was fixed upstream