Merge branch '2938-use-ddoc-cache-in-filtered-changes'