Reinstate bounded documentStore
(revert mistake)
#6548
Merged
documentStore
(revert mistake)
#6548