Duplicate thought type
Merge remote-tracking branch 'quietust/master' into 0.40.14-osx-offsets