Limit TB log to 4000 characters
Merge branch 'release' into upstream