class needs applying more widely
Merge branch 'document_transaction' into testing