updates from upstream, chatmute & editmute