usf bug fix
update
Merge commit 'refs/top-bases/t/svr/chat' into t/svr/chat