Merge "Fixing DockerFile to avoid IOException"