Merge branch fix/couchdb_update_commit_things with refs/heads/master into refs/merge-requests/64/train