Manual merge for https://github.com/couchbase/couchbase-lite-java-core/commit/063b4e9c72e18aac3130061588e86df757673122
Manual merge for https://github.com/couchbase/couchbase-lite-java-core/commit/0e8e249dbc7f4f1ac651e1b24b56fdc02a755992