Merged dechatter branch. Passes auto-bisect.sh test