Merge "Updated the docker version"