Merge branch '3067-improve-couch-log'