Updates for held back chat.
Merge remote-tracking branch 'origin/master'