less severe truncation for full text
Merge remote-tracking branch 'origin/master' into db
error recovery trials