Merge "Fix the docker version of ESR"