Merge branch '1843-feature-bigcouch'