Merge branch 'tb/document-status-u-tradeoff' into maint