(cherry picked from commit 18d6132593145c031902c3a1b73bb7f1f8ccb89b) # Conflicts: # build/ci/Dockerfile