Merge "Docker build for SO"