diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b45dde5de1e4cafdbc02a15c4b775b763d5447bd..7b24c1ef360433601c298f4066ed8db99b7d8ead 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@
 
 variables:
   DEPLOY_REF: dev
-  CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb/caosdb-pylib/testenv:latest
+  CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb/src/caosdb-pylib/testenv:latest
   # When using dind, it's wise to use the overlayfs driver for
   # improved performance.
 
@@ -65,7 +65,7 @@ trigger_build:
   stage: deploy
   script:
     - /usr/bin/curl -X POST
-      -F token=$DEPLOY_TRIGGER_TOKEN
+      -F token=$CI_JOB_TOKEN
       -F "variables[F_BRANCH]=$CI_COMMIT_REF_NAME"
       -F "variables[PYLIB]=$CI_COMMIT_REF_NAME"
       -F "variables[TriggerdBy]=PYLIB"
@@ -92,15 +92,16 @@ build-testenv:
     - docker push $CI_REGISTRY_IMAGE
 
 # Build the sphinx documentation and make it ready for deployment by Gitlab Pages
-# documentation:
-#   stage: deploy
-
 # Special job for serving a static website. See https://docs.gitlab.com/ee/ci/yaml/README.html#pages
 pages:
   stage: deploy
   only:
-      # TODO this should be for master only, once releases are more regularly
-    - dev
+    refs:
+      - /^release-.*$/i
+      - master
+    variables:
+      # run pages only on gitlab.com
+      - $CI_SERVER_HOST == "gitlab.com"
   script:
     - echo "Deploying"
     - make doc
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e190313f02f94d31bb3a0e9f0310eed7b729ea4..6defee79fbc4c170408f193bdb2e920ff3276826 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added ###
 
+* `etag` property for the `caosdb.Query` class. The etag allows to debug the
+  caching and to decide whether the server has changed between queries.
+
 ### Changed ###
 
 ### Deprecated ###
diff --git a/README_SETUP.md b/README_SETUP.md
index 2db73cfaec2f6aadfc7fa3742892d970d562c946..4980b850ecd9fdc10c9fd02c6437aeb5826578b3 100644
--- a/README_SETUP.md
+++ b/README_SETUP.md
@@ -156,3 +156,6 @@ Build documentation in `build/` with `make doc`.
 - `sphinx`
 - `sphinx-autoapi`
 - `recommonmark`
+
+### Troubleshooting ##
+If the client is to be executed directly from the `/src` folder, an initial `.\setup.py install --user` must be called.
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 1a6cb7b52bea35107ed46142c5e5802f500afaac..d491a1d340796b9b4701b307003c3e62e75d6001 100755
--- a/setup.py
+++ b/setup.py
@@ -47,9 +47,9 @@ from setuptools import find_packages, setup
 
 MAJOR = 0
 MINOR = 5
-MICRO = 1
+MICRO = 2
 PRE = ""  # e.g. rc0, alpha.1, 0.beta-23
-ISRELEASED = True
+ISRELEASED = False
 
 if PRE:
     VERSION = "{}.{}.{}-{}".format(MAJOR, MINOR, MICRO, PRE)
diff --git a/src/caosdb/common/models.py b/src/caosdb/common/models.py
index 9592e484654d3a610d5516cb7ca52c3df71682ba..d8f42a3f1eb4f8b8f5e4c1a5e648a01381622ec7 100644
--- a/src/caosdb/common/models.py
+++ b/src/caosdb/common/models.py
@@ -3661,6 +3661,7 @@ class Query():
         self.flags = dict()
         self.messages = _Messages()
         self.cached = None
+        self.etag = None
 
         if isinstance(q, etree._Element):
             self.q = q.get("string")
@@ -3670,6 +3671,7 @@ class Query():
                 self.cached = False
             else:
                 self.cached = q.get("cached").lower() == "true"
+            self.etag = q.get("etag")
 
             for m in q:
                 if m.tag.lower() == 'warning' or m.tag.lower() == 'error':
@@ -3714,6 +3716,7 @@ class Query():
         cresp = Container._response_to_entities(http_response)
         self.results = cresp.query.results
         self.cached = cresp.query.cached
+        self.etag = cresp.query.etag
 
         if self.q.lower().startswith('count') and len(cresp) == 0:
             # this was a count query
diff --git a/unittests/docker/Dockerfile b/unittests/docker/Dockerfile
index e41fb91b3e9ae54cff277519c03f481c21264e9e..7fa3f75bd198724628dee48ab328829fa071a639 100644
--- a/unittests/docker/Dockerfile
+++ b/unittests/docker/Dockerfile
@@ -5,6 +5,6 @@ RUN apt-get update && \
       curl pycodestyle \
       python3-sphinx
 ARG COMMIT="dev"
-RUN git clone -b dev https://gitlab.com/caosdb/caosdb-pylib.git && \
+RUN git clone -b dev https://gitlab.indiscale.com/caosdb/src/caosdb-pylib.git && \
     cd caosdb-pylib && git checkout $COMMIT && pip3 install .
 RUN pip3 install recommonmark sphinx-rtd-theme
diff --git a/unittests/test_query.py b/unittests/test_query.py
index f4b3ee9762d9d76b65ace9a5b9b3f4039c0c6919..12622ea486dda717ca1fbc1255510575c5e0c8e6 100644
--- a/unittests/test_query.py
+++ b/unittests/test_query.py
@@ -26,20 +26,23 @@ import caosdb as db
 
 
 def test_query_parsing():
-    s = '<Query string="FIND bla" results="0" cached="true"/>'
+    s = '<Query string="FIND bla" results="0" cached="true" etag="asdf"/>'
     q = db.Query(etree.fromstring(s))
     assert q.q == "FIND bla"
     assert q.results == 0
     assert q.cached is True
+    assert q.etag == "asdf"
 
-    s = '<Query string="COUNT bla" results="1" cached="false"/>'
+    s = '<Query string="COUNT bla" results="1" cached="false" etag="asdf"/>'
     q = db.Query(etree.fromstring(s))
     assert q.q == "COUNT bla"
     assert q.results == 1
     assert q.cached is False
+    assert q.etag == "asdf"
 
     s = '<Query string="COUNT blub" results="4"/>'
     q = db.Query(etree.fromstring(s))
     assert q.q == "COUNT blub"
     assert q.results == 4
     assert q.cached is False
+    assert q.etag is None