includes also #8818 (closed) because it was necessary to update the sdk and docker images on both branches.