Merge "Update docker image Update docker base image so that clamp uses the official...