Merge branch 'chisel-chat' into pt